From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 24 Apr 2008 22:34:42 +0000 (+0000)
Subject: Revert r33836 and bump cached user object version so any bad cached items get cleared.
X-Git-Tag: 1.31.0-rc.0~48077
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=b335579d020bb9391e1a955b2115563d1bdfc082;p=lhc%2Fweb%2Fwiklou.git

Revert r33836 and bump cached user object version so any bad cached items get cleared.

* mEmail was already cached, don't need it twice.
* mRights isn't safe to cache -- it may change due to updates to $wgGroupRights, which won't clear the cached User entries.
---

diff --git a/includes/User.php b/includes/User.php
index 7ab5b0761a..3e01e28735 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -8,7 +8,7 @@
 define( 'USER_TOKEN_LENGTH', 32 );
 
 # Serialized record version
-define( 'MW_USER_VERSION', 5 );
+define( 'MW_USER_VERSION', 6 );
 
 # Some punctuation to prevent editing from broken text-mangling proxies.
 define( 'EDIT_TOKEN_SUFFIX', '+\\' );
@@ -96,7 +96,6 @@ class User {
 		'mOptions',
 		'mTouched',
 		'mToken',
-		'mEmail',
 		'mEmailAuthenticated',
 		'mEmailToken',
 		'mEmailTokenExpires',
@@ -104,7 +103,6 @@ class User {
 		'mEditCount',
 		# user_group table
 		'mGroups',
-		'mRights',
 	);
 
 	/**